Convert users of static functions to new gjs syntax

svn path=/trunk/; revision=86

diff --git a/js/ui/appdisplay.js b/js/ui/appdisplay.js
index 07a6af4c6471ec6ad5b406b4fa48829989e0416a..7fbf6c46535cf4dbabec0b4fb1727e70f6f5d884 100644 (file)
--- a/js/ui/appdisplay.js
+++ b/js/ui/appdisplay.js
@@ -57,7 +57,7 @@ AppDisplayItem.prototype = {
 
        let name = appinfo.get_name();
 
-       let icontheme = Gtk.icon_theme_get_default();
+       let icontheme = Gtk.IconTheme.get_default();
 
        this._group = new Clutter.Group({reactive: true,
                                         width: width,
@@ -114,7 +114,7 @@ function AppDisplay(x, y, width, height) {
 AppDisplay.prototype = {
     _init : function(x, y, width, height) {
        let me = this;
-       let global = Shell.global_get();
+       let global = Shell.Global.get();
         this._search = '';
         this._x = x;
        this._y = y;

diff --git a/js/ui/main.js b/js/ui/main.js
index b2217906d70927ae0131e58a3785592208820170..320f9e00e1b55b09494a565572c432756bec29b9 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -84,7 +84,7 @@ ClutterFrameTicker.prototype = {
 Signals.addSignalMethods(ClutterFrameTicker.prototype);
 
 function start() {
-    let global = Shell.global_get();
+    let global = Shell.Global.get();
 
     Tweener.setFrameTicker(new ClutterFrameTicker());
 
@@ -125,7 +125,7 @@ function start() {
 // the stage. Returns true if we successfully grabbed the keyboard and
 // went modal, false otherwise
 function startModal() {
-    let global = Shell.global_get();
+    let global = Shell.Global.get();
 
     if (!global.grab_keyboard())
        return false;
@@ -136,7 +136,7 @@ function startModal() {
 }
 
 function endModal() {
-    let global = Shell.global_get();
+    let global = Shell.Global.get();
 
     global.ungrab_keyboard();
     global.set_stage_input_area(0, 0, global.screen_width, Panel.PANEL_HEIGHT);

diff --git a/js/ui/overlay.js b/js/ui/overlay.js
index 827d36660d5c672f96b1eae8062bf7b7cf2570e2..48c9310133763ccd488b675b9cfb20b85b2f39e6 100644 (file)
--- a/js/ui/overlay.js
+++ b/js/ui/overlay.js
@@ -54,11 +54,11 @@ Sideshow.prototype = {
     _init : function(width) {
        let me = this;
 
-       let global = Shell.global_get();
+       let global = Shell.Global.get();
         this._group = new Clutter.Group();
        this._group.hide();
        global.stage.add_actor(this._group);
-       let icontheme = Gtk.icon_theme_get_default();
+       let icontheme = Gtk.IconTheme.get_default();
        let rect = new Clutter.Rectangle({ color: SIDESHOW_SEARCH_BG_COLOR,
                                             x: SIDESHOW_PAD,
                                              y: Panel.PANEL_HEIGHT + SIDESHOW_PAD,
@@ -130,7 +130,7 @@ Overlay.prototype = {
     _init : function() {
        let me = this;
 
-       let global = Shell.global_get();
+       let global = Shell.Global.get();
 
        this._group = new Clutter.Group();
        this.visible = false;
@@ -161,7 +161,7 @@ Overlay.prototype = {
     },
 
     _recalculateSize: function () {
-       let global = Shell.global_get();
+       let global = Shell.Global.get();
         let screenWidth = global.screen_width;
        let screenHeight = global.screen_height;
         // The desktop windows are shown on top of a scaled down version of the
@@ -176,7 +176,7 @@ Overlay.prototype = {
        if (!this.visible) {
            this.visible = true;
 
-           let global = Shell.global_get();
+           let global = Shell.Global.get();
 
            let windows = global.get_windows();
            let desktopWindow = null;
@@ -235,7 +235,7 @@ Overlay.prototype = {
 
     hide : function() {
        if (this.visible) {
-           let global = Shell.global_get();
+           let global = Shell.Global.get();
 
            this.visible = false;
            global.window_group.show()
@@ -260,7 +260,7 @@ Overlay.prototype = {
     },
 
     _createDesktopRectangle : function() {   
-        let global = Shell.global_get();
+        let global = Shell.Global.get();
         // In the case when we have a desktop window from the file manager, its height is
         // full-screen, i.e. it includes the height of the panel, so we should not subtract
         // the height of the panel from global.screen_height here either to have them show

diff --git a/js/ui/panel.js b/js/ui/panel.js
index e6db389dad61907ed79b4325da7584f158ef2a45..c3f91437f63cd913a4ce29853334db3d936b920a 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -22,7 +22,7 @@ function Panel() {
 
 Panel.prototype = {
     _init : function() {
-       let global = Shell.global_get();
+       let global = Shell.Global.get();
 
        this._group = new Clutter.Group();
 
@@ -101,7 +101,7 @@ Panel.prototype = {
     // Struts determine the area along each side of the screen that is reserved
     // and not available to applications
     _setStruts: function() {
-       let global = Shell.global_get();
+       let global = Shell.Global.get();
 
        let struts = [
             new Meta.Strut({

diff --git a/js/ui/run_dialog.js b/js/ui/run_dialog.js
index aa8beaa2653c1682fb2742552379f72b4ea27709..4746a86682617dcba5c23beb02d4dacec7c32359 100644 (file)
--- a/js/ui/run_dialog.js
+++ b/js/ui/run_dialog.js
@@ -24,7 +24,7 @@ function RunDialog() {
 
 RunDialog.prototype = {
     _init : function() {
-        let global = Shell.global_get();
+        let global = Shell.Global.get();
 
         // All actors are inside _group. We create it initially
        // hidden then show it in show()
@@ -111,7 +111,7 @@ RunDialog.prototype = {
         //         return true;
         // });
 
-       let global = Shell.global_get();
+       let global = Shell.Global.get();
         global.stage.set_key_focus(this._entry);
 
        return true;

diff --git a/js/ui/windowmanager.js b/js/ui/windowmanager.js
index 83dde3d5b1326278a78587a3b06ade5479113dbc..0c447163dff734186ef5912f5baa88d718b999f6 100644 (file)
--- a/js/ui/windowmanager.js
+++ b/js/ui/windowmanager.js
@@ -18,7 +18,7 @@ WindowManager.prototype = {
     _init : function() {
         let me = this;
 
-        this._global = Shell.global_get();
+        this._global = Shell.Global.get();
         this._shellwm = this._global.window_manager;
 
         this._switchData = null;